[automerger skipped] Merge "Make metrics proto RAT consistent with ServiceState." am: e30ea1b7 am: a9401d2b -s ours

am skip reason: Change-Id I5179387120887d53929e0fe82a302e69322ad56d with SHA-1 8927b4a7 is in history

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

Change-Id: Ia68ba1b2abac9c2e384de2e65325826e4a2435f0