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

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



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