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

Change-Id: I1e5ec2228201d97f49ad5d1560dd4401efe5eb7a