Merge "DisplayCutout: Fix attrs.xml javadoc" into pi-dev
am: 813a4bee76

Change-Id: I43eb3e82b86657a085ff9adba609e94a6fb3b031