Merge "1/N Move plugin loading into PluginInstanceManager." into sc-v2-dev am: 498d436d54 am: 875d917932

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

Change-Id: I9ea7f2299d8ac728b4b2b97edc3bf2e8298e61ae