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

Merge "Merge "Add cleanup for KeyguardService.wrap()" into udc-dev am: 497617ba am: 44d5a0d3" into udc-d1-dev-plus-aosp am: aac298a7

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



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