Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7

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

Change-Id: I0264012861a8a0c68714c91955b9ab395859e128