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 am: 8f253cb4

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



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