[automerger skipped] Merge "Fix app battery usage list launch incorrect works...

[automerger skipped] Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev am: b0503be6 am: 7578a43c -s ours

am skip reason: Merged-In Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1 with SHA-1 eda172ce is already in history

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



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