[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours am: 23ee1b87bb -s ours am: 917b429f3d -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 25b172abfd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359209
Change-Id: I9df209fa5bc013c75a9c24a5a105184f814af2bf
This commit is contained in: