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

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c3 -s ours am: 70a56579 -s ours am: 80a87528 -s ours am: a5402412 -s ours am: cd5bad24 -s ours am: 671263bc -s ours am: eb8b4420 -s ours am: 5656402f -s ours

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

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

Change-Id: I4c454d26974f0ff8771308a0ef3a2a545e1850f4