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

Merge "[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a304 am: ea36a0c2 am: 043a322e -s ours am: 29eef120 -s ours am: b984203c am: 0482ee7e -s ours am: 6d513e33 am: dca36e93 am: 5141d726" into rvc-qpr-dev-plus-aosp am: 25996d45 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia77682f9d4b3aa1f0a569dacd76e58bdf86d09f6