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

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



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