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

Merge "Only use the first available suffix value when loading drivers." into udc-qpr-dev am: ed6c97e5

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



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