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

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



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