Merge "More `android.util` internals, with tests." into main