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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75126aa0d60680357349f2bbf355d9f88cd8bfaa