Merge "Remove PIP tuner items" into oc-dev
am: 86339dc8ee

Change-Id: I8d584f830e706f20d181a0f46bf94783f30340e8