Merge "Ignore IgnoreBatteryOptimizationsTest on TVs" into stage-aosp-sc-ts-dev