Merge "Merging from ub-launcher3-master @ build 6304996 am: 58be046dff am: 789b0444af" into rvc-d1-dev-plus-aosp