[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: 6e920718 am: b61a2067 am: 3d176cdb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f970cc6534aed2561720c00294bf8b766f7b335