Merge "SyncSM02: implement addState function" into main am: c5ebf2a7e6 am: bf562951db am: 1f47a8a873

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

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