Merge "SyncSM11.1 make some functions inline" into main am: f1c04ca91f

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

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