[automerger skipped] Merge "RIL changes for 1.5...
[automerger skipped] Merge "RIL changes for 1.5 setLinkCapacityReportingCriteria" am: ca118f47 am: 32e6efcb -s ours
am skip reason: Change-Id I2f32c187dc02e2a563298e065a06158575eca80c with SHA-1 5899fa72 is in history
Change-Id: I9a106e538b28c16d52dab0203799778c30ff1f7e