Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b

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



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