Merge "Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6 am: a43f9d93fb" into rvc-d1-dev-plus-aosp am: 69c437ca28 am: 4c05b965da

Change-Id: I47cc8d68b4b8a4308482be7e3bd58c47afe72c26