Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f4

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



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