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

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

Change-Id: I53a4307f86335f382a99b31f0ba87bbd48ee002c