Merge "Remove resources from SystemUI-tests" into aosp-main-future