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

[automerger skipped] Merge "Fix error handling for non-dynamic permissions" into sc-dev am: e09941cf am: 54c767b3 am: 2c02137a -s ours am: 2bb0396b -s ours am: a24f025c -s ours am: f7a8efc4 -s ours am: 21903667 -s ours am: 94043eae -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/+/26297402



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