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 am: 80a87528 -s ours am: a5402412 -s ours am: cd5bad24 -s ours am: 671263bc -s ours am: eb8b4420 -s ours am: 5656402f -s ours" into sc-qpr1-dev-plus-aosp am: 589fe1a7 -s ours" into sc-v2-dev-plus-aosp