Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: 979fb7ea am: 7d8f93fd am: 8c921235 Change-Id: I273d8f2616eeacee9f88cfe5e0bf4fc390f72bfd