[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1fe5d0f794 -s ours
am: 7570888e50 -s ours
am skip reason: change_id I794543699084d787a259098cbe8d4a5c9e204857 with SHA1 da29bd3958 is in history

Change-Id: I4e7959479bab61658f9cfe51f11b26d6210c0379
tree: 4c8c511259290e79f03946e1195e016492b1a050
  1. includes/
  2. src/
  3. test/
  4. Android.bp
  5. libpac.map.txt
  6. LICENSE
  7. OWNERS
  8. README