Merge "MediaSession2: Update Builder" into pi-dev am: 9f0cfbc8e9
am: dcaeb27238

Change-Id: I6bc8557d6e81ec1d47ddaae6723af102fd761c66