am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit '60823dc1f90198ab2ec0e8b62cb03900251fcf77':
  Add more intelligence to bluetooth connection state