[automerger skipped] Merge "Merge "Correctly support LTE carrier aggregation"...
[automerger skipped] Merge "Merge "Correctly support LTE carrier aggregation" am: 5f432748" into stage-aosp-master
am: fbbef075 -s ours
am skip reason: change_id I92b37c17c92b127c7d3729b266be3989b2f2e810 with SHA1 43ed6b43 is in history
Change-Id: If4d221bcda83afdd352699c49e13f8cf18401677