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: e4fa9114

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



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