Merge "Move some definitions into anonymous namespaces" into udc-qpr-dev am:...

Merge "Move some definitions into anonymous namespaces" into udc-qpr-dev am: 635339c5 am: 4d835ab0

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



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