Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83
am: d2631c30f2
am: 3ce409f3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091 Change-Id: I0e9588cedc356e32191649b73eee1b06ba3ffb16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: