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

Change-Id: I9f03b716b8d93fe8672d4f153034593abd47c020