[automerger skipped] Merge "Only use the first available suffix value when...

[automerger skipped] Merge "Only use the first available suffix value when loading drivers." into main am: ff9f151b am: c386ed13 am: 44f9e7f3 am: 4dd01f8d -s ours am: 1db1f57a -s ours

am skip reason: Merged-In Id6dd9a5aec5e737e8251f9b5f63176a9f8ebc594 with SHA-1 b8aaeaf5 is already in history

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



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