Translate MR2 status bar fix to master.

Fix is different in master due to recent keyguard refactoring.

Bug:8567697
Change-Id: Ie668ef0e3018e3f835166508afd9a72c3c1dda84
1 file changed