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

Change-Id: I234a22a713b355876abb4917a16a0971a8cb9689