am 2665ad11: am 9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev

* commit '2665ad11e9e3794dab5f5591ec0fceafddb2d58d':
  NPE in bluetooth MAP cause bluetooth process crash