Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into...

Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into sc-qpr1-dev am: e2c9a05e am: c38558d4 am: 37999dca

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

Change-Id: Ie1353a295f7cce012c193f924ddd18b10979814f