Merge "Address minor stylistic issues" into udc-dev am: 76289e4f am: e8a42693 am: a7df955b

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



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