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