Merge "Fix LauncherInstrumentation for OOP tests from gradle" into tm-qpr-dev am: 4298b36ef4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19865266

Change-Id: I86224b7d685f495d91c2a6245d6f1ed5462b5332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>