[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 5533b62982
am: 88d74818ca -s ours
am skip reason: subject contains skip directive

Change-Id: I9abde002204c5705acd5dd29a653d71f8b42917a
tree: d03995ff05f3e8b54fec41aaad5702556dfea977
  1. files/
  2. google/
  3. soong/
  4. wfa_certs/
  5. Android.bp
  6. OWNERS
  7. README.cacerts