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

Change-Id: I5e8ce0749a8b1e787e8ee3db90399d304d090e76