Merging ub-launcher3-master, build 5345913

Test: Manual

Fixes: 124786795
Change-Id: I25110bc2253fa8c1c90def3ec572f7b1b0f034ac
tree: f732bb58f094224a17d53f8e679d6b6f5247dc90
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml