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

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



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