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: e227609d am: fc96d9df am: d64d439b

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



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