Merge changes from topics "fix_builder_set_style", "fix_missing_nullability", "fix_static_final_builder" am: aed2d4c3b6 am: 4fafe53831

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2437180

Change-Id: I3a00ce1b5dac3da27c2f4f81867e4136c6db8d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>