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

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

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