[automerger skipped] Merge "cameraserver: fix minor typo" am: f3441c15 am:...

[automerger skipped] Merge "cameraserver: fix minor typo" am: f3441c15 am: cd3d99e7 am: 2ed634c4 -s ours

am skip reason: Merged-In Iae142132e6a00c1f20ebedfc7e666fd4ea99ef31 with SHA-1 67de9c87 is already in history

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



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