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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ebe7a1a4da45b4e238de50aa21691afffa30203