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

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



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