Merge "Added strict_mode: false to android.bp for the robolectric tests" into main