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

Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c3 -s ours am: 70a56579 -s ours" into qt-dev am: 7162d024 -s ours am: 50c77976 -s ours am: 0fe296d6 -s ours am: 6ec148e2 -s ours am: 4d380e27 -s ours am: 18671436 -s ours am: 028ac7e6 -s ours am: 4a74f9ae -s ours

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

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

Change-Id: I9baa683b639ac54bf72f3b356c9a60cc20daa648