Merge "Deprecating LauncherInstrumentation constructor with parameter" into ub-launcher3-qt-qpr1-dev am: dd079691c1
am: 1430f132f3

Change-Id: If494e30957893c4e3414ebdbd274601d16a66a98