[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into...

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49 -s ours am: 4d56213c -s ours am: 01429a24 -s ours am: 841ccfd9 -s ours am: 38d670d1 -s ours

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

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

Change-Id: I2bd1cc77ba1128512ff700222245c095acaa1a89