Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev am: d83f286818 am: aa95ba6456
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347870 Change-Id: I56e344892f90d4bdaef2e83a2bc94f2004880612
This commit is contained in: