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

[automerger skipped] Merge "Set extra info before registering" into rvc-dev am: 9e974c13 -s ours am: cbe06315 -s ours am: 00492cdf -s ours

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

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

Change-Id: I522d61a684c919f9ee1c86aaecf37bc453913561