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

Change-Id: I50502ac10103abe0aa1f30f5b1d5fcf9d96a2e33