Merge "Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 20aaa198f3" into rvc-d1-dev-plus-aosp am: 35e2d9b343

Change-Id: I6ec9f99b11038e5a53f3863a0a4d588957e1a512