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 am: 8e0bc647 am: 5a43b402

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



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