Merge "Don't use androidx nodeps modules" into main