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

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b am: 0122320c -s ours am: 5a382b69 -s ours am: be89b2aa -s ours am: 4bd02929 -s ours am: 86ed339c -s ours

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

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

Change-Id: Ic600f9784b98f14bb41b91a0d618fb8f0ae95a4b