[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 837d21c9e8 -s ours am: c99b9236e6 -s ours am: c667acfc02 -s ours

am skip reason: Merged-In I2fa5e22443604733cd9eef8e0f94b437c6eb26d3 with SHA-1 3c6f7b7251 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/16279343

Change-Id: I3458c768cd810d8fa6e624fc315ba1ed524b9038
tree: c3b7c73279906fe21c62ceac75fae0f5687f7547
  1. build/
  2. docs/
  3. emu_test/
  4. libraries/
  5. scripts/
  6. tests/
  7. utils/
  8. PREUPLOAD.cfg