Merge "Revert "Temp tracking of plugin load/unload requests"" into udc-dev am:...

Merge "Revert "Temp tracking of plugin load/unload requests"" into udc-dev am: ec55a87d am: e6d988e5

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



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