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