Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: aa070915 am: bb5603d6

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



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