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

Change-Id: I2f97f51ec1ceb479584f01ad05733c59d4f3b402
tree: 2ca63a07662d88913d3b4a3f940b52005119c289
  1. PMC/
  2. sl4n/
  3. UID/
  4. OWNERS
  5. PREUPLOAD.cfg