Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps."...

Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into rvc-dev am: 7c97d21a am: c352a78c am: 3f11cd7b

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

Change-Id: I789b7d831cd2ae23306ff9391c76fa1c3f286f9e