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