Merge "[IT03] Add replacement methods for network activity" am: 4ba82f5dba

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00c4a1046f3b67003f5091d92022477b9347212f