[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0ac68ac167
am: 91f7d20308 -s ours
am skip reason: subject contains skip directive

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