Merge "Repair header from the modem in testapp" am: c1c8feb3ed

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1597082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4df903703f04cc248315a47e37bbf921e613c30e