Merge "Let confirmation dialog can appear" am: c98338dec0

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

Change-Id: I3e1a1f469ad07235d82225d990b9ad1a5f22a4fd