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

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

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