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

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87 -s ours am: 47d2f291 -s ours am: 6db47d2d -s ours am: 804799ae -s ours am: da9baed3 -s ours am: 642240ef -s ours

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

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

Change-Id: I3ebeb0e2e4e9e8e7c9b937df6ddd8538b02b4146