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 am: da0ecabafd
am: 9d66f94f38

Change-Id: I5e4b1272325ab0f16eb4cfc981b10a05c776a2da