Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev
am: 1e9bf7c91b

Change-Id: I1f880dab8fc44a812d78fd57712a4b7b04cad7d1