Merge "Camera: Add user tag to camera action event" into tm-dev am: 006a15b8 am: 9be8181b

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



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