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

Merge "Merge "Let confirmation dialog can appear" into rvc-dev am: 4e10d57e am: fc31ef0d" into rvc-d1-dev-plus-aosp am: ff1be0ac

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

Change-Id: Iaeb34af84ce735aaf223900d4396a084c2adc3ff