[automerger skipped] Merge "Add radio_state to telephony.proto" am: 180ed867...

[automerger skipped] Merge "Add radio_state to telephony.proto" am: 180ed867 am: dc3f7d1f -s ours am: 2aed6bdc -s ours

am skip reason: Merged-In I0f776e7bd034b5644dd8fce1106b2c327e14d475 with SHA-1 fddc6116 is already in history

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

Change-Id: I3e9a4dbe2cb216b3c628bb7e5f695afa45d43e48