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

Merge "Cameraservice: Fix watch data formatting whitespace" into udc-dev am: 300ec401 am: 20ffde51 am: 4f394d61

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



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