Merge "[Fix_format] log:overlay paths indent error" into main am: 9bf81137e9 am: dd5ab0aa0d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3235606

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