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

Change-Id: Ia8a66ae5613ac2e7149904a563dd17a42b4937ef