Follows-up I5b14d65a and I5a563c59. Change-Id: Id42e1b868c9fe97cdb14b4bc7328947820a7fd94
Also remove some wrappers from ResourceLoaderImageModule tests that are no longer necessary, since the files they were mocking now exist. Bug: T86334 Change-Id: If02e58716ce8e6c8327c8939c6c6425bd48bb560