Merge "Port commit I5d2669b0f234f3707085369d253fab5868b4218f from legacy...

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

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



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