[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: 8b9393f4 -s ours am: 1af61a3c am: 943eafc4 -s ours am: 122c1bd1 am: 2c76c749 am: 0d85bb59

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

Change-Id: I4fcfd9599e3ff1abe0e5d44366d538fcd943c36c