Merge "Merging from ub-launcher3-rvc-dev @ build 6511067 am: 41dc164d11 am: 3ec5c4970c" into rvc-d1-dev-plus-aosp