am 04c1c088: am c30f9355: Merge "Remove bluedroid configuration warning"

* commit '04c1c0883c0833f5cd1190446baa58d6c04018da':
  Remove bluedroid configuration warning