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: I8f4fcbc18c344d5fdf1283fe6cb84bef0a7cc068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>