[automerger skipped] Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether we have captured secure layers." into pi-dev am: 1dc64d287f -s ours
am: 14eda77e75

Change-Id: If9efe204f0a6e6e66ef02dd991afbdbe5db2975a