Merge "Fix the volume of A2DP devices which switching audio" am: d24fd2d44a
am: eb592d880e

Change-Id: I79a1f19d0539c565d42557e5b6da8d03160f75cf