[automerger skipped] Merge "Show app list in Battery Usage page when there is...

[automerger skipped] Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d am: 9a4844c2 -s ours

am skip reason: Merged-In If536c93652506c8009f5cabf3d0ae373b6825bfc with SHA-1 1051fb16 is already in history

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



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