Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: 979fb7ea am: b4947934 Change-Id: I0a712bbbda3f3574eda2052371065b16b5a76f2d