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

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

Change-Id: I6b4abc8004ae79e597d51032de826f176167aca9