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

Change-Id: Ib05b0b15cdbd918ae508f20a701e4b267c95954c