Merge "Merge "Don't call setKeyguardGoingAway on background thread" into rvc-dev am: 0bea1417 am: e03efb53" into rvc-d1-dev-plus-aosp am: 298a900b

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

Change-Id: I2c49a4ec775c9fabfb37f5d12642f607a2e77d5e