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

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



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