Merge changes from topic "new_proxy_header" into main am: 63c259943a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3512192

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