Merge "Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066 am: 2deb21875d" into rvc-d1-dev-plus-aosp am: 7f602a95cc

Change-Id: I6c6e9e750d2f65faf8cc707b582eba1692200c42