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

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

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



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