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