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

Change-Id: Ic47bf5e7f87d7f1c52850bec6c14e339d02cd0ac