Merge "Disable failing tests and revisit after holidays" into aosp-main-future