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

Change-Id: Ie0051f57f871f5312a9ed05943481a383139f3ea