Merge changes from topic "threadnetwork-apex" into main am: de60dd2a am:...

Merge changes from topic "threadnetwork-apex" into main am: de60dd2a am: 2c6eb766 am: 536a1af9

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



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