Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev am: f00b496b4d
am: c58de01f77

Change-Id: I91c715d8663833f10d829dc7feee963319ccc627