[automerger skipped] Merge "Fix method not found for NotProvisionedException...

[automerger skipped] Merge "Fix method not found for NotProvisionedException hidden api" into udc-qpr-dev am: ef8d9738 -s ours am: 3582ab5e -s ours

am skip reason: Merged-In I59955afd06e514713cbe0d114c242b62eb748eda with SHA-1 b61d8021 is already in history

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



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