[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: 78d86bee -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic90d24c0c37dfec6fab85668962ea8ffd94cfd1f