Merge "Remove dismiss check from security container" into udc-dev am: 27dcd8bb am: 3a0f9800

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



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