Merge "charger: fix secondary display not turning off after first display was...

Merge "charger: fix secondary display not turning off after first display was off" am: e18dd44f am: 8cd08557

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



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