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 am: 00d2e5ca

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



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