Merge "Update the default location mode for Battery Saver in order to get droidfood test coverage on the intended change." into sc-dev