Merge "Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode. am: c175253b6d am: f86e12ba89" into oc-dr1-dev-plus-aosp
am: 289fd0d079

Change-Id: I1cc67242355440e7c6ab931bd400db2b6e2445cb