Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED" am: 025a3c993a

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

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