[automerger skipped] Merge "Set extra info before registering" into rvc-dev...

[automerger skipped] Merge "Set extra info before registering" into rvc-dev am: 9e974c13 am: 3a27fb50 am: aec94119 -s ours

am skip reason: Change-Id I613c610640e19afdc77e37143e45ee165737b663 with SHA-1 d70c5230 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11747778

Change-Id: I3fe6d1ae65e3b6fb51c37643f3cb572585abfd5c