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

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

Change-Id: Idbefe401913165dd58a51f67458a896f6cc3eee0