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

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

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