Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev am: 0d65dda435 am: 938c48478e am: 50d5805563

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

Change-Id: I25b5288b3d6d6c632e21d3985080b1d1bb987e81