merged ub-launcher3-dorval, and resolved conflicts

Test: $ make -j 32 dist checkbuild
Bug: 62196967

Change-Id: Ibdcdde25cb117574549404348105d49348e79bea

diff --cc res/values-az/strings.xml
Simple merge

diff --cc res/values-bn/strings.xml
Simple merge

diff --cc res/values-bs/strings.xml
Simple merge

diff --cc res/values-eu/strings.xml
Simple merge

diff --cc res/values-gl/strings.xml
Simple merge

diff --cc res/values-gu/strings.xml
Simple merge

diff --cc res/values-hy/strings.xml
Simple merge

diff --cc res/values-is/strings.xml
Simple merge

diff --cc res/values-ka/strings.xml
Simple merge

diff --cc res/values-kk/strings.xml
Simple merge

diff --cc res/values-km/strings.xml
Simple merge

diff --cc res/values-kn/strings.xml
Simple merge

diff --cc res/values-ky/strings.xml
Simple merge

diff --cc res/values-lo/strings.xml
Simple merge

diff --cc res/values-mk/strings.xml
Simple merge

diff --cc res/values-ml/strings.xml
Simple merge

diff --cc res/values-mn/strings.xml
Simple merge

diff --cc res/values-mr/strings.xml
Simple merge

diff --cc res/values-my/strings.xml
Simple merge

diff --cc res/values-ne/strings.xml
Simple merge

diff --cc res/values-pa/strings.xml
Simple merge

diff --cc res/values-si/strings.xml
Simple merge

diff --cc res/values-sq/strings.xml
Simple merge

diff --cc res/values-ta/strings.xml
Simple merge

diff --cc res/values-te/strings.xml
Simple merge

diff --cc res/values-ur/strings.xml
Simple merge

diff --cc res/values-uz/strings.xml
Simple merge

diff --cc src/com/android/launcher3/LauncherModel.java
Simple merge