[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 31017d0acb -s ours
am: 73199fb00d -s ours
am skip reason: change_id I02b83849a0fdd86253bb210b8ffef9e2aa800367 with SHA1 bb8bc95b3b is in history

Change-Id: Icdfdce1b1a6b6d66fd8d7183569f6106652d9d6b
tree: 4d7cd45b04f71591ec7b94b06e5f0a9ae5e3577c
  1. library/
  2. OWNERS
  3. PREUPLOAD.cfg