Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev am: 50eef33f20

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

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