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

Merge "Camera: Add user tag to camera action event" into tm-dev am: 006a15b8 am: 69ab51a1 am: 753c1c33

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



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