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 am: 0c7a8723

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



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