Merge "Replace deprecated AndroidJUnit4." into main