Merge "Fix error handling for non-dynamic permissions" into sc-dev am: e09941cf

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



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