Merge "Merge "Merge "Corrects HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PATCH_DATE" into nougat-cts-dev am: 2f4b6e60a0" into nougat-mr1-cts-dev am: e712610a8c" into oreo-cts-dev