Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev

<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (C) 2017 The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" />

    <path

        android:pathData="M0 0h24v24H0z" />

</vector>

 No newline at end of file

<?xml version="1.0" encoding="utf-8"?>

<!--

Copyright (C) 2017 The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6 6h2v12H6zm3.5 6l8.5 6V6z" />

    <path

        android:pathData="M0 0h24v24H0z" />

</vector>

 No newline at end of file

        android:layout_width="100dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="-50dp"

        android:src="@drawable/ic_pause_white_24dp"

        android:src="@drawable/ic_pause_white"

        android:text="@string/pip_pause"

        android:visibility="gone" />

</merge>