Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e
am: 08923b73f4

Change-Id: I5b4b6a208cb6fde4ba806f5aec3782244b772b94