Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30 am: f9ef6e3b3c

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

Change-Id: I2173be2c3868824ed97f4453a0736b1644c6ae91