Merge "Merge "Don't allow both setRelative and setLayer for the same surface."...
Merge "Merge "Don't allow both setRelative and setLayer for the same surface." into qt-dev am: 68b39308 am: 09c0b61f" into qt-r1-dev-plus-aosp
am: ddce3e77
Change-Id: Ic1f585a907d58aaf782db05297e96463552af978