Merge "Merge "Change PIP notification icon" into oc-dev am: 9f3967fe am: e9ede054" into oc-dr1-dev-plus-aosp am: f541405a Change-Id: Ic868b80e07c0585132f14f7c9dc2b490c811a9f6