Merge "SurfaceUtils: query CONSUMER_IS_PROTECTED" into oc-dev
am: 9694ba347a

Change-Id: I24ff9e036cd2b1812fd0cb15fbe20ae687de382e