Merge "Update the default location mode for Battery Saver in order to get...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454876

Change-Id: I765d5a094d832d658072fddb181ae866eb5c0b1d