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

Change-Id: I315c43b99303dd225c0cf79ae14500e55b68fdde