Merge "charger: fix show qustion mark when start to draw UI" am: fad4ded8...

Merge "charger: fix show qustion mark when start to draw UI" am: fad4ded8 am: 39b3e879 am: f0f505fa am: ad6da0d9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2490903



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