Merge "[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a30457 am: ea36a0c236 am: 043a322e4d -s ours am: 29eef120e2 -s ours am: b984203cb2 am: 0482ee7eed -s ours am: 6d513e3306 am: dca36e934b am: 5141d72634" into rvc-qpr-dev-plus-aosp am: 25996d45d6 -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