[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 5cf1066716 -s ours
am skip reason: change_id Iea1a341889f8df021223fb7294ce8725865b0952 with SHA1 efc223c833 is in history

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