[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: d3bf821fcb -s ours
am skip reason: change_id I2bdaf1520b9e5ad8a4a8ed2f5b0bf3d8c33f083f with SHA1 31458c02ad is in history

Change-Id: I2f370c20dc11241db039f60c70ddcf96a238b566
tree: 3a5b26e145f6189bd77e7bf27090cad9404ff208
  1. configs/
  2. gae/
  3. proto/
  4. script/
  5. .gitignore
  6. __init__.py
  7. OWNERS
  8. PREUPLOAD.cfg