Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether we have captured secure layers." into pi-dev