Merge "Fix CTS android.systemui.cts.tv.BasicPipTests fails"