Merge "Add example of PiP capabilities when using MediaSession. am: 32300d91...
Merge "Add example of PiP capabilities when using MediaSession. am: 32300d91 am: 2c974e0b am: 2b80de7c" into oc-mr1-dev-plus-aosp
am: cb53987b
Change-Id: Iea81b09c6478caf9ef214b5b6ac1d7d4d0504e88