Merge "API level 30 upgrade: AOSP/Launcher3"