Merge "[IT03] Add replacement methods for network activity" am: 5cb10d24d0 am: 59dd3432f7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2ca929e5074f70851d19e896b66da8b8f59d0a9
tree: 3888c84bd6880726aa65b0b4ece2fa4c32f00e00
  1. core/
  2. services/
  3. tests/
  4. OWNERS