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

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



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