Merge "Change android.test.UiThreadTest to androidx.test.annotation.UiThreadTest" into main