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

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

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