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

Change-Id: Iee45882aa11644046c374a7715b2ad836fb85d43