DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I6e3ee6c45ba613fe86cfe452d9d090cbfdeba6c4
tree: 0ec013b648cebf24d9a5c442df5eb532799df28b
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml