Merge "Allow workspace to provide icon positions in tests" into tm-dev am: 21ea6828d8 am: e06672c251

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

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