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

Change-Id: I7f00ef3c36326aef9cb3789a07946d7f29dac612