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

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

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