Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 81f05b9011

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

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