Merge "Let confirmation dialog can appear" into rvc-dev am: 4e10d57e am: fc31ef0d am: e23ab76b

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

Change-Id: I2f6d422b0c9155463f6c9453d8edaf10e592047f