Merge "Fix typo to get correct innerFec and Annex for cable signal" am: 6d1582be99

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18b7ecb227645cb2cc1af9976f94d740585a9ff1