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