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