Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK",...

Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED" am: c45eb287 am: 76e4e498 am: cbc6745a am: bff554fe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951462



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