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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4562193739e7e824082e11d6943cd00db5c55ad