[automerger skipped] Merge "Partial hal support for secondary link bandwidth"...

[automerger skipped] Merge "Partial hal support for secondary link bandwidth" am: bed5f6e8 am: 3504c8c7 am: a9ec6916 -s ours am: c8c3b285 -s ours

am skip reason: Change-Id I5dd23812fe72b751ab29459111d0bc8f6cc63e39 with SHA-1 2ad14681 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67b7193beb52616e7f30014f4b1888e1ffc0647d