Merge "Small improvements in code cleanliness" into udc-dev am: 8367afeb am:...

Merge "Small improvements in code cleanliness" into udc-dev am: 8367afeb am: 4caa9bc7 am: b87ef58f

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



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