[automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade:...

[automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396 am: 179b7696 -s ours

am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c016851 is already in history

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

Change-Id: Icffa0849618ac2da9324754d7f5770614c342c71