Merge changes from topic "presubmit-am-ad6d5f64563d48c980b3845a26947098" into sc-qpr1-dev am: b5924a8401 am: 9830408411

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

Change-Id: I9ed41159db77af1ab5141b923b3713d2fc3ad095