Merge "Cameraservice: Fix watch data formatting whitespace" into udc-dev am:...

Merge "Cameraservice: Fix watch data formatting whitespace" into udc-dev am: 300ec401 am: 38b1e57a am: 08a5d03d

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



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