Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into...

Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into sc-dev-plus-aosp am: a3d87964 am: 6c46f85a

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

Change-Id: I211e02b64e77be96d8c672f7e1c92a98d25ec39a