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

Merge "Remove dismiss check from security container" into udc-dev am: 27dcd8bb am: 4a761bac am: bea16b19 am: 77387002

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



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