Merge changes from topic "threadnetwork-apex" into main am: de60dd2ae5 am: 2c6eb76638 am: 536a1af980 am: f2a27e68df am: 8346b71546

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

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