Merge "Apply extra saver confirmation dialog once required (1/2)" into udc-dev am: 4c75bada am: 4d179902

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



Change-Id: Ie87119143489baa5454fa0c577098ddd71224e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>