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

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

Change-Id: I23369f9c08c495ded8384503b0d700933702bb2e