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

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



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