[automerger skipped] Merge "Added build from existing NetworkRegistrationInfo"...

[automerger skipped] Merge "Added build from existing NetworkRegistrationInfo" am: 9e6697d6 am: 0b0144b8 am: a1ed474f -s ours am: 4089c571 -s ours am: a78a3a1d -s ours

am skip reason: Merged-In I02be2913c1a0968369d3a810ce0928e464b855ee with SHA-1 dc487d57 is already in history

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



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