[automerger skipped] Merge "Add metrics for airplane mode and modem restart"...

[automerger skipped] Merge "Add metrics for airplane mode and modem restart" am: a301a43e am: f1a3b6b7 am: 2cda9a6a -s ours

am skip reason: Change-Id I9bbdb5603f347d0641ecee94a32ae9e3c0d41357 with SHA-1 d9bc4851 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife3c7178f495fdc9823d7e9e6f1adb9dfe5642b1