Merge "Merge "SurfaceView: Expose hook for subclass to position child...
Merge "Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev am: 89b18289" into pi-dev-plus-aosp
am: 331561fb
Change-Id: I00e9ad45911d0c9b7e411bff6064303b41a96283