[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: feea31acc7 am: f9e99ecf8f -s ours
am skip reason: subject contains skip directive

Change-Id: Id6b4ef9005200f0ba7ea11fc413b6ba321db5b1a
tree: 2cd50cfc2c483f67ba503f2475968f06bdb4a184
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml