Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726



Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>