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

Change-Id: I9cc8503daa68cbc45f288bf61afa54d3ad4045f2