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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0da6d452e989f7a89e33230cabfdc89c1a49ce6d
tree: 089aec6fa4582d1f4b30ddfb4fccb33c1d69415e
  1. core/
  2. services/
  3. tests/
  4. OWNERS