Merge "Repair header from the modem in testapp" am: c1c8feb3ed am: fd342d4782 am: 9defbca419 am: 585f305bff

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a636271fb4911f519838b411ddcac2ab001d7e0