Merge "libsurfaceflinger: fix screenshot permission check am: fc0b911090" into oc-dr1-dev-plus-aosp
am: bba7d5aa30

Change-Id: I90a181f5d229e5dc5d599aa39faf6a397bcddc2b