[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours am: 23ee1b87bb -s ours

am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 25b172abfd is already in history

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

Change-Id: I0a73172b5a3c1775acd152ef2907a5cbe9834c40
This commit is contained in:
Dave Mankoff
2021-08-09 21:37:44 +00:00
committed by Automerger Merge Worker

Diff Content Not Available