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

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

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