Merge "Change bluetooth routing to be more responsive"
am: d79e129b5d

Change-Id: Icd6264a9d9aa666363d6250092476b7b07990ff3