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: I8cc43f62042bdff22e2ee65427e0bf50e98aeb45