Merge "Add plugin to list before sending PLUGIN_CONNECTED am: 440e6fae5e" into qt-dev-plus-aosp
am: 50570aed46

Change-Id: I678679ab95dff641b0ccc57b19e07c44f8232859