Merge "Change regular expression format of serial number" into android12-tests-dev am: b1dec97e08

Original change: https://android-review.googlesource.com/c/platform/cts/+/2446037

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