Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp am:...

Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp am: 81a7cf81 am: 378bdf9f

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



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