Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into main am: 1f05f9d3a1 am: 49122f7ddf am: 288693a585

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

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