[automerger skipped] Merge "Move Theme::Entry definition to top of file" into...

[automerger skipped] Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp am: 81a7cf81 am: 378bdf9f am: f36b4568 -s ours

am skip reason: Merged-In I6c231184c3a4c0e67dd29d43560b0c28778883db with SHA-1 41e15a0f is already in history

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



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