Merge "Adding the avility to add icons on multiple CellLayouts on tests." into tm-qpr-dev am: 68f5667338

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

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