Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: cd19370eba am: 274f879ec1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1c5f5fc46131f6e5b586b76505e7f666547e96
tree: 4e310235937c2eb42e24292dbd7c06dad3d41cd7
  1. core/
  2. services/