display upmerge from display-android-commonsys.lnx.1.1 to display-sysintf.lnx.1.2

Change-Id: I2c9cc4bc3d87cb69bfb1a564ab7fdafe51fd2735