Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a271085506 am: 3309850150 am: 633f0ca00d" into rvc-qpr-dev-plus-aosp