Merge "Corrects HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PATCH_DATE" into nougat-cts-dev