Merge branch 'ub-launcher3-master' into ThemePicker

Bug: 122524192
tree: 141dd704bd04724c3ca935e1de7c8e37ba389f15
  1. res/
  2. src/
  3. src_override/
  4. Android.mk
  5. AndroidManifest.xml