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