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

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5 -s ours am: 23ee1b87 -s ours am: f08acfef -s ours am: c57c02c7 -s ours am: 1d95cd8c -s ours

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

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

Change-Id: I1637a972d666bd51cca8b6227a179f1f81cce955