Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
am: 9967a4d3af

Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867