Merge "Update androidx build sdk to 30 instead of current"