Merge "Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41 am: a668e4b4e3" into rvc-d1-dev-plus-aosp am: 96cca43da4 am: 5b4accc35b

Change-Id: I3e40f16b7dc80cd4aa4110948830fa218b1f95eb