Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into rvc-dev am: 7c97d21a84 am: c352a78cda

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

Change-Id: I28ec85f97547a49e127a4b73ed782593b8112ad2