Merge "Be the current user to get A2DP proxy"
am: c3824e5d57

Change-Id: I3e6dd95a575c0cccd7343b2b26f1eefd3e465edf