[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: 9c8b5972 am: 4d7fdcf9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I32ce51ff9d3747229f64495b0b62691a32863fa7