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

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



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