[automerger skipped] Merge "DO NOT MERGE Don't allow non-instant permissions...

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

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

Change-Id: I44766a4d453f6be10fd9aaac3d5a75decbf5919c