[automerger skipped] Merge "Fix error handling for non-dynamic permissions"...

[automerger skipped] Merge "Fix error handling for non-dynamic permissions" into 24D1-dev am: e6f86ad1 -s ours

am skip reason: Merged-In Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5 with SHA-1 528a87e9 is already in history

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



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