Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 63d5fd85e6 am: ad0d18bd86

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

Change-Id: Ic737844b7f4e0e41b95b9f79e88e7d7e51c82c33