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

* commit '9dc561f7f13569552a62f771b16fe35dc5b9cd16':
  NPE in bluetooth MAP cause bluetooth process crash