Merge "have one implementation of deviceSuffix" into main am: d9c0272480

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3340926

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