Merge "Don't use deviceSuffix, it isn't needed" into main am: 261b77ae4c am: c3d370a3be

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3341398

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