Merge "Enable builtin formatting hooks" into main am: 444e9e9b41 am: a9d2f2f0e2

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

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