[automerger skipped] Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into qt-dev am: eafc07a70a am: 81119f44e7 -s ours am: 46c2e55ae5

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

Change-Id: Icbb4ad71bbc0f3230e78dc06e0c7597adfe8f010