[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev am: 6265a0fc -s ours am: 3d8f771d
am: c1f8f3d4 -s ours
am skip reason: subject contains skip directive
Change-Id: Icb2cc09333ead8139f569d1f1951584e2630a1c9