Merge "Merge "Let confirmation dialog can appear" into rvc-dev am: 4e10d57e am: a1254b41" into rvc-d1-dev-plus-aosp am: f88a10b6 am: aa163155

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

Change-Id: Iac43779a68ef09b090f4edf2c12e17e3e927903e