Merge "Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b92263 am: d52c7e3ec8" into sc-qpr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
6710d5c091