Merge "Remove dismiss check from security container" into udc-dev am: 27dcd8bb am: 06065b54

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



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