Merge "Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e365 am: 9740abb4" into qt-r1-dev-plus-aosp