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