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

[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

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

Change-Id: Icdf14261c4b2fa307681ca8fe174b2b277e52512