Merge "Merge "Revert "Temp tracking of plugin load/unload requests"" into...

Merge "Merge "Revert "Temp tracking of plugin load/unload requests"" into udc-dev am: ec55a87d am: e6d988e5 am: 7c7d4997" into udc-qpr-dev-plus-aosp am: 993607c0

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



Change-Id: I9db0d4e106a1acf6278c7d29f123fa698550d0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>