Merge QP1A.190219.001

Conflicts:
src/com/android/bluetooth/a2dp/A2dpService.java

Change-Id: Ieca8541e93000761ff60a2443e01f13b284186cb