Merge "Port commit I5d2669b0f234f3707085369d253fab5868b4218f from legacy...

Merge "Port commit I5d2669b0f234f3707085369d253fab5868b4218f from legacy prompt to new prompt." into udc-d1-dev am: a1783404 am: 30238953 am: 6f53a927

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



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