merged ub-launcher3-dorval, and resolved conflicts
Test: $ make -j 32 dist checkbuild
Bug: 62196967

Change-Id: Ibdcdde25cb117574549404348105d49348e79bea