Merge changes from topic "event-framework" into udc-qpr-dev am: 6e133007 am: ad3875ad

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



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