Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev am: 31f6a3dc8b
am: 8603879526

Change-Id: I31e86c12b2df2d98cee514ce57d27da9c5e6beef