Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94dfc am: 979fb7ea81 am: 7d8f93fdfa am: 8c921235d8
Change-Id: I273d8f2616eeacee9f88cfe5e0bf4fc390f72bfd
This commit is contained in: