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

Change-Id: I636eca9f7f3ad8f86966df6882b376a60fd46156