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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c
tree: cc84f36467f237b70b421e34922348239e499595
  1. core/
  2. services/