Merge "Only use the first available suffix value when loading drivers." into...

Merge "Only use the first available suffix value when loading drivers." into main am: ff9f151b am: c386ed13

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787109



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