Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into...

Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-qpr1-dev am: 6fc1f0fb am: e38b5e54 am: 7ccf7fd1 am: 13d94f41

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

Change-Id: Ic1ed9847d2b380ba80018fe62662bed73d315f04