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

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

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



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