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: 80fb4b57

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



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