[automerger skipped] Merge "Correctly support LTE carrier aggregation" am: 5f432748
am: 0ed4749e -s ours
am skip reason: change_id I92b37c17c92b127c7d3729b266be3989b2f2e810 with SHA1 43ed6b43 is in history
Change-Id: I57b745c92062a04106551f661e61a9bf4ac85288