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

Merge "[automerger skipped] Merge "Set extra info before registering" into rvc-dev am: 9e974c13 am: 3a27fb50 -s ours" into rvc-d1-dev-plus-aosp am: 0e25ef2f -s ours am: cb19527c -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: I13304ea897d68ad303b223f2d35986a8e68e26c1