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

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

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