Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
am: bde4eb5bcb

Change-Id: I0b81c971b5b466e967b8255cfc400c780c9078ba