Merge "Fix tab by replacing it with spaces" am: d6751bd159 am: 893f5f39ac

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

Change-Id: I399616eedc5159da5bac04b238d2c96fff380b38