[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

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

Change-Id: I78713f6de0b8a6a05a4ed6568b2d7912607c2a73