Merge "Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: 69ebef4c4a" into rvc-d1-dev-plus-aosp am: 8a2acf1249 am: 4b80dadd70

Change-Id: If6688699d238edb4a2d332d5caedf1d4fd9b2cdf