Merge "cameraserver: fix minor typo" am: f3441c15 am: cd3d99e7

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



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