Merge "SurfaceFlinger: fix Sf/App offsets provided in getDisplayConfigs()" into qt-dev
am: 1688f5246f

Change-Id: I916612b8d722fb91b78b532cc286db3d15168c2b