Merge "Be the current user to get A2DP proxy" into pi-dev am: 022cf30d17
am: f3fb14a773

Change-Id: Ida3557b2afc70fa5465aafae43475d83634b0018