Merge changes from topic "presubmit-am-cb4679fd6eb1414cb720168b20bbb591" into sc-qpr1-dev am: f409849bc4 am: 45066a9fca

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

Change-Id: I26124ef2346882a78f8fb2cf5536fb1b8c046181