Merge changes from topic "am-70d7c5523393494f9738846a0863736f" into main

* changes:
  [automerger skipped] Merge "HDMI: Update OWNERS" into android14-tests-dev am: 42dcf1927e -s ours
  [automerger skipped] HDMI: Update OWNERS am: 48911ffffd -s ours