Merge "SF: Confine display serial number to EDID parser" into rvc-dev am: 3c04ff2647 am: 33c67d3586

Change-Id: Iabc4b3c682f99373e94a7cb5de3ce4a8ed5ab1c9