Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 122f22518b

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

Change-Id: I0e1ed4aac6dd20f83993c8a8754374db91677014