[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: 7ce3f9b2 am: 1f358d4b

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

Change-Id: I0c47c64b8711f8f433e79f7ffe46a79f47d8115c