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

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

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