[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7 am: ef0cdab0 -s ours

am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 b7083337 is already in history

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



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