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

Change-Id: Ib60b7a8f428df0030ea8f7556cbe6f90ff258676
tree: 2ceaf70da2b52f87ba7b13923c19d3bdbfc7f244
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS