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