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

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



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