Merge "[automerger skipped] Fix KeyguardSecurityContainerControllerTest am:...

Merge "[automerger skipped] Fix KeyguardSecurityContainerControllerTest am: 81ebe916 -s ours am: af8ecc70 -s ours am: 67981f61 -s ours am: f1b1af27 -s ours" into udc-qpr-dev-plus-aosp am: 5c11f75d -s ours

am skip reason: Merged-In Ie341c5d85845098b358f247e6eb8fad05ff0029c with SHA-1 81ebe916 is already in history

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



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