Merge "Fix method not found for NotProvisionedException hidden api" into main...

Merge "Fix method not found for NotProvisionedException hidden api" into main am: 296af97b am: aad7c274 am: 9da5d290 am: 68c14c30 am: 3d40c8b4

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



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