Merge changes from topic "presubmit-am-1d1cd88cc63d4a20a2e01c6e7836744e" into sc-dev-plus-aosp am: 52aa6a195b am: cda66341fe am: 3966fd77e1

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

Change-Id: Idf2699d56aa9825444bff04980d01b620b920319