Merge "Clarify the behavior about event and property triggers" am: 717ece73 am: 00229196

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2319963



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