Merge "Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev am: 106b5eefd2 am: 13186772e6" into oc-mr1-dev-plus-aosp
am: 6077e7213c

Change-Id: Ifbe21d5e2b569eb8d6155a196a8072c8bcc482d1