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: 3806a2a2 -s ours am: 7d6482b4 -s ours am: f3cf4a43 -s ours am: 92e929d9 -s ours" into sc-v2-dev-plus-aosp