Merge "[Thread] prefer only ML-EID in case OMR is missing" into main am: 93fa683874 am: 2bb2c04033

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3538959

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