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

Change-Id: I3aa86408c8c23500f8d19c5f0e599db7d63ca8e2