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

Change-Id: I9a46b6a07dcc063d539e3cf28f182f0bf7cfd64e