[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: 741e955d am: ca0f11fb -s ours am: 8ae87399 am: 4872c241 am: 3ced0fd0

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

Change-Id: Ibcc2c9df3335ef6fec2060a560fd70e0ee820cef