Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev am: b0503be6

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



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