Merge "Address minor stylistic issues" into udc-dev am: 76289e4f am: 2b843345 am: d3a8cc35

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



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