Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6396980" into rvc-dev am: ce6f43f0df am: 49661f2a96" into rvc-d1-dev-plus-aosp am: 40329ec69b

Change-Id: I2ee22383c91f873a4a0ea493e739b3471cf166f9