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

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

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



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