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

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



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