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

Change-Id: Ie47fc57944fac98ac2806ea547c5cee9cbd21d18