[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: 8b9393f4 -s ours am: 1af61a3c

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

Change-Id: Ie6ea88015aa98a38bcf0069357dbda984dd92e61