[automerger skipped] Merge "Prevent infinite layout while hiding nav bar on...
[automerger skipped] Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev am: a41c75d6
am: 85a2ecd9 -s ours
Change-Id: Idbb741af07855683da59fa8e07768e335047f734