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

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

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