[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 am: 4c72e851 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifaf8acb274e83df1077d29f828f2f4ca4bf9ad23