am 50d42294: am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."

* commit '50d42294bdc983e05eca0fb0099bbb9f634fd5e3':
  Remove useless workaround for HTC RIL bugs.