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

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

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



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