Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev am: 91568eb50e am: 485249abd1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I566259b63f76a79795f604d3409ff2547995f9ba