Merge "Fix inconsistent connected without charging state in the Settings" into...

Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad am: 4b1d5b8e

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



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