Merge "Added build from existing NetworkRegistrationInfo" am: 9e6697d6a9 am: 0b0144b84b

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

Change-Id: Iadf6e5acf4d42347e276bde93948f2a0a028c03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>