Merge "[SurfaceFlinger] Make sure switch the protected state of buffers." into qt-dev am: 6902bb6ca8
am: 3341f1894e

Change-Id: Ia556bd4cf20a8a835f0edc5311e636e30978774d