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

[automerger skipped] Merge "Move Theme::Entry definition to top of file" into aosp-main-future am: 546bbb0a -s ours am: 96f09ac0 -s ours am: f649bd2e -s ours am: 22a06f90 -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: If008424c52255151c0e433317d2a66ec96dbf38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>