tree bf95ac7ba1ca3da71f42e896bfd738c59fdaf6bf
parent 7c97d21a841558043e834b10d5d85143a8f8ca30
parent ca0f11fbe486e13e515583ad9223f9ccdcb6f663
author Hai Zhang <zhanghai@google.com> 1598666738 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598666738 +0000

[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: 741e955d12 am: ca0f11fbe4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia632a02ca2c0b4a33fab19696f0c1785187428c0