Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: eef71ecf11

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c