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

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

Change-Id: Ic87b95844023e55271560be35cff7a4c64a426ba