Merge "Disallow reflection on Display.getDisplayInfo and Display.displayCutout"