Merge "Review comments followup" into tm-dev am: 80a315e50f

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

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