[automerger skipped] Merge "Make metrics proto RAT consistent with...

[automerger skipped] Merge "Make metrics proto RAT consistent with ServiceState." am: e30ea1b7 am: a9401d2b -s ours am: 7a5d1952 -s ours am: 06f31b7d -s ours am: 2a7e85e5 -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: Ie77041ea1ffa0218173d08acb4d3d50a09984359