Merge "Merge "Add cleanup for KeyguardService.wrap()" into udc-dev am:...

Merge "Merge "Add cleanup for KeyguardService.wrap()" into udc-dev am: 497617ba" into udc-mainline-prod am: d6a10f73

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



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