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

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

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