tree 47beb5c7d75401579102ba82c27019a4e871fdea
parent d66409cd207e9ffeacf348383afd28a6252dc0bd
parent 4872c2412b4fc816e3636454eaee190f6bcd5240
author Hai Zhang <zhanghai@google.com> 1598668328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598668328 +0000

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

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

Change-Id: Icde1cf6e857f0b4fd168c3eab36555081131f625