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