[automerger skipped] Merge "Add NrState and NrFrequency to telephony metrics"...
[automerger skipped] Merge "Add NrState and NrFrequency to telephony metrics" am: 606113a4 am: 29a460a5 -s ours
am skip reason: Change-Id I8678ca580b7fec9f88515707e8e0d96ddf42b5f3 with SHA-1 039e2517 is in history
Change-Id: I53db3f9be8e37303afd91958f73512cd669b1d8e