Merge "DisplayCutout: Fix NPE in deprecated constructor and add nullability annotations"