Merge "libmodprobe: use ordered map for deterministic module loading" into...

Merge "libmodprobe: use ordered map for deterministic module loading" into main am: 3e464e6e am: 61f2ae9d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3206531



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