Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a1d am: 2edabacc98

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

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