[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: 53228df2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8ab780c1dd7788797ed8b76b52107c89854ad5b