Merge "Address minor stylistic issues" into udc-dev am: 76289e4ff8 am: ce8f493a4b

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

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