[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: 0c195406 am: 8cc32fb4

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

Change-Id: Iff74b8f4f2a8baee81a9e8392ea6ed18d6b6c8ae