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: bf38ed55 am: c416dabc

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

Change-Id: I728cf7d646100633accba8c2caa4b981e281ebe6