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

Change-Id: I16a9bc71853eef3334fec3ff7939859818daae13