[automerger skipped] Merge "HAL changes for 1.5 setLinkCapacityReportingCriteria" am: f595ab64ca am: d5037bed93 -s ours am: 57e7316e65 -s ours
am skip reason: Change-Id I330d5be6bf531c93439f8f1d55718f71ec46c1c3 with SHA-1 fec7c4e0a0 is in history

Change-Id: Idd25ffe3a8c2cb0b6213b1ee54bbc13e8b1768b7