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

Change-Id: I427ba9348e63a390407453d12a9dd7b226c9daee