[automerger skipped] Add NrState and NrFrequency to telephony metrics am: 039e2517
am: 51234f70 -s ours
am skip reason: change_id I8678ca580b7fec9f88515707e8e0d96ddf42b5f3 with SHA1 7be1aa6b is in history
Change-Id: I60dacc99ce5cd97272e5f95bfc33fd9a50738878