Merge "Fix HFP client JNI NPE and concurrency issues in JNI and service"
tree: 94a8ffd9eff981edd3804921558cc16d0263913a
  1. android/