Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a am: c3e1e032

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



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