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