Merge "HDMI: Fix BCD handling error" into main am: 32662e92fa am: 2a3ae1df46

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3207253

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