Merge changes from topic "presubmit-am-323f1efd13694d1c823ff0877ccea911" into sc-qpr1-dev am: be48c68bd2 am: 731dab5d7d am: b365f127d2

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

Change-Id: I8972f8be0dcd08b1bf3ea4fb240c2796ff87ecfa