Merge "Remove custom PluginHandler from PluginInstanceManager" into sc-v2-dev am: 67cf37f39b am: 5fc92b5770

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

Change-Id: Ic34f50bc0241bed0bbb21262b6e8ee6004f234b2