[automerger skipped] Merge "Fix typo to get correct innerFec and Annex for...

[automerger skipped] Merge "Fix typo to get correct innerFec and Annex for cable signal" am: 6d1582be am: b7172b5b am: 40d6bb1f -s ours

am skip reason: Change-Id I9213246c87512480cb08ab10b102b26f9fd9f681 with SHA-1 af7f386a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id94afeb873115e7cc076a3cecda7d397cf7d8c88