Merge changes Ib0cc04db,I646615fb into sc-dev am: 8ae0baa546 am: ad0d6db140

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

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