Merge "Update PluginManagerWrapper to match SysUI changes" into udc-dev