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

Merge "Merge "Address minor stylistic issues" into udc-dev am: 76289e4f am: 2b843345 am: d3a8cc35" into udc-qpr-dev-plus-aosp am: 8ba3e398

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



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