Merge "Add parameter for serial number property to rkp tool" into main am: 670aca611d

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

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