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

Change-Id: I74a83f00a3572b99a29527adfc9c4727e865fe8a