Merge "Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066 am: 2deb21875d" into rvc-d1-dev-plus-aosp am: 7f602a95cc am: 80e7090bbe

Change-Id: I07ed6266dd14e818e612429088e2d38fa3c8737d