Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: I5b817c812ccc45088e6be551bbfe14946a21175a
Merged-In: I0f9ac646b953d8831f47f28b2f20df90d9b028d9
tree: 28458a3aa3ae27b497830d58c31a2c82e9e68cca
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. robolectric_tests/
  5. src/
  6. src_override/