Merge "Fix META-INF for settings library to match robolectric" into main