Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into...

Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp am: 780a5e3a am: 57cbc6d7 am: 9d24a56e

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

Change-Id: I3b9b740fd942a73a4c73ca40f39862bcf4d8e2d2