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

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

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