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: 302e0c86

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



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