Merge "Improve battery saver setting a11y semantics" into pi-dev
am: 577f2af92b

Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377