Merge "Move tests for frameworks-base-testutils lib into their own target" into main