[automerger skipped] Fix KeyguardSecurityContainerControllerTest am: 81ebe91609 -s ours am: af8ecc7055 -s ours am: 67981f61d4 -s ours
am skip reason: Merged-In Ie341c5d85845098b358f247e6eb8fad05ff0029c with SHA-1 8eb68c7ebe is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22822859
Change-Id: I934a7fd2ec05070762d375529555438f75b01e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: