tree 0bb4ac69f8916b355e02ee8bbd11cb0ea6f5e7b0
parent 0c195406ed0e3d9a3acfdd33af53e4f7afe28da5
parent 46c2e55ae54cb994ffb9c8c3fbc33ab9282b4366
author TreeHugger Robot <treehugger-gerrit@google.com> 1598668245 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598668245 +0000

[automerger skipped] Merge "DO NOT MERGE Don't allow non-instant permissions for instant apps." into qt-dev am: eafc07a70a am: 81119f44e7 -s ours am: 46c2e55ae5

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

Change-Id: Icbb4ad71bbc0f3230e78dc06e0c7597adfe8f010