Merge "Remove dismiss check from security container" into udc-dev am:...

Merge "Remove dismiss check from security container" into udc-dev am: 27dcd8bb am: 6aa744f4 am: e4a6aabf am: e5f5eec7

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



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