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