Merge "cameraservice: Correlate various CameraActionEvents" into udc-dev am: 851106c8 am: debc82ff

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



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