Add mDesiredServingState field in BaseServingState am: 3ec851ef03

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

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