Merge "Let confirmation dialog can appear" into rvc-dev am: 4e10d57e34 am: fc31ef0de9

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

Change-Id: I2502d2335b8e5a8c3c1ff79a6198b5606e3c415f