Merge "Merge "Added data share event types to ContentCaptureServiceEvents atom" into rvc-dev am: 85319103 am: 34df1464 am: 79fd3d77" into rvc-qpr-dev-plus-aosp am: 0befbe75

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

Change-Id: I7be39c91bfcb3fc62ae22754858720be26da9b6a