Merge "Update preparers to align across everything" am: e2c1c6fadd

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

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