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

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

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