Merge "Add current state to unhandled message error log" into main am: 46a5123374 am: c8dc063252

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

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