Merge changes from topics "setter_getter_fix", "use_header_block" am: ba0f26fb86

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

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