Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94dfc am: 979fb7ea81 am: b494793420 am: 0f59a18c42
Change-Id: Iae4a2a64e83c07dbe8d79d144829d86ef26371ab
This commit is contained in: