Merge "Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 am: 69a4e37d19" into oc-dr1-dev-plus-aosp
am: 0612a84a6b
Change-Id: I2267934054146beb1391eb1be91f2098e648c7f0
This commit is contained in: