tree ce8e6b59e7d8cf09befc39cca71bcb3a9c6610e8
parent eb8b442022e9bc730ffd9840fdaeca09107cf979
parent 26c8f8d054425db4c6d9cbc02440cca3bb339b14
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628637691 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628637691 +0000

Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours

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

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

Change-Id: I664e04e4f05c9ef94728f2d2b7890ba7892d3be2