Merge "Relax policy for non-dismissible calls am: 5ec7baf0 am: b0361e14...

Merge "Relax policy for non-dismissible calls am: 5ec7baf0 am: b0361e14 am: 99460de0" into udc-qpr-dev-plus-aosp am: 0a203a52

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



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