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

* commit '4945ac8099eb35112307f94c7c5ea7513f657fd3':
  NPE in bluetooth MAP cause bluetooth process crash