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

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

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