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

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

Change-Id: I4c2bf87c5f5fcbc8461a3ebc50b898fedfea5c0a