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

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



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