Merge "Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev am: 1e9bf7c9 am: 7cc9d298" into oc-mr1-dev-plus-aosp