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

Change-Id: I58c82aa630d89791d7cde528e5e5f0f1d415f06b