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

Merge "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: 26c8f8d0 -s ours am: 4bc1c08a -s ours am: 98f71be4 -s ours" into sc-qpr1-dev-plus-aosp