Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 68ec26e60c
am: 22a6d302fe

Change-Id: Idbe7d08b01d9138c5c2082f08a392090dd82c466