[automerger skipped] Merge "Migrate to public IndentingPrintWriter" am:...

[automerger skipped] Merge "Migrate to public IndentingPrintWriter" am: 1dc67122 am: 5ff53808 am: 160a9ad7 am: 50009f8e am: 85e61711 -s ours

am skip reason: Change-Id I9a0d87ac19b5c21991b6b54626df0ee3f7c2b077 with SHA-1 041d3188 is in history

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

Change-Id: I11afefc6f4a8584817ac810161814f15d96756eb