Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev am: 741afeca21 am: 484fac3716

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23434000

Change-Id: If20e61f00e0704b47c7903f70db058d47a981844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>