am 31b1f6a1: am 53db16dd: Merge "Bluetooth: Handle CHLD cmd properly incase of Held call"

* commit '31b1f6a13c1cd4a067bfb6ae5a48d3e49be95670':
  Bluetooth: Handle CHLD cmd properly incase of Held call