Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into...

Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into main am: 1f05f9d3 am: 49122f7d

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



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