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

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



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