[automerger skipped] Move Theme::Entry definition to top of file am: 3899b442 -s ours

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

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



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