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

Change-Id: I4f7a5e40cd2f0d35c16ba2cdc79c2ec1d3bdb881