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: b8d6800e am: 4a5d6153 am: 47a2bea3

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



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