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

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

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