Merge changes from topic "presubmit-am-1d1cd88cc63d4a20a2e01c6e7836744e" into sc-qpr1-dev am: 30cf131415 am: 21adfacf15 am: acff9fec1a

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

Change-Id: Ie57372a74e1a86b21cdc7f80d0bd847b3957183d