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

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

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