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

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

Change-Id: Id06f6d10d69013ba03a95d482cf157457e67e521