Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-dev-plus-aosp am: 3939db651c am: 8b31baa6d9 am: 87104f6bb3

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

Change-Id: Ic5faaad6428d75869f848c2e50961c3c301eb969