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

Change-Id: I93aef75b94b56bfe2f31958c373a44582df0ec02