Merge "Make apache-harmony-tests visible to //libcore:libcore-non-cts-tests-txt" into main