Implements additional battery info menu behavior.

This is a manual cherry-pick of commit
6a43a06cac12494cd27e5b5cad4149a272d90038.

Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
2 files changed