Merging from ub-launcher3-qt-qpr1-dev @ build 5834630

Test: manual, presubmit on the source branch
http://x20/teams/android-sysui/merge/ub-launcher3-qt-qpr1-dev_5834630.html

Change-Id: I259c498f915bd21efbb6e5dbda7d9a6b5e6b6ca6
tree: e274c55358f1639a00ed65526b2a117f367af6bf
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml