Merge "Revert "[SurfaceFlinger] Add GPU protected content support.""