Merge "Handling exception when per-use prompt cannot be generated" into tm-dev...

Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: 246ecfd4 am: a6c2fa8e

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



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