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

Change-Id: Ia4ecd35123fe0964b80482e072e327748bbc2fe1