Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-mainline-prod am: c1fbe420d0

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

Change-Id: I2fd2fffb563aad8aa9c79087e8bdb42849e05093