[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: bab9819b21
am: c8c79a5cc2 -s ours
am skip reason: subject contains skip directive

Change-Id: I5838ca7a4c5edddce27541e87450067d3abf800e
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml