Merge "Disable battery saver tests on TV" into stage-aosp-sc-ts-dev