[automerger skipped] Merge "[DO NOT MERGE] Bring power monitor to AOSP" am: c1069cdee8 am: a7b92dde89 am: c05a25778b am: 2a7ca3d2c8 am: 87460c74e9 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1443735

Change-Id: Ie3bb806f32a864a747f0edce6154ccc73aeca763
tree: 8ecfc6fa2f51d664efd7690b5b57e34cbf22dc10
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg