Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-dev-plus-aosp am: 08713c8ad5 am: 3d1a04c942 am: f1905197f8

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

Change-Id: Ifb237cd08335dc6aed47a34f789fed39b72c0605