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

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



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