[automerger skipped] Merge "Fix error handling for non-dynamic permissions" into sc-dev am: e09941cfb2 am: 54c767b369 am: 2c02137a36 -s ours am: 2bb0396b11 -s ours am: a24f025c51 -s ours am: f7a8efc491 -s ours am: 21903667a4 -s ours

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

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

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