Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED",...

Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7

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



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