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

Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b am: 0122320c -s ours am: 5a382b69 -s ours am: 4b8f7a79 -s ours am: 49ee6869 -s ours am: c2021a30 -s ours" into sc-qpr1-dev-plus-aosp am: 445ed1a0 -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/+/15358519

Change-Id: I4d63178d8e126ca616c5b84aabf4e4dbd7071e86