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