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

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49 am: f27380d2 -s ours am: bc0c5310 -s ours am: cc31d16b -s ours am: ca205fd1 -s ours am: 9bda3e3b -s ours

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

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

Change-Id: I7df8ffbe5692084dc4e2174847a77d984b076a5f