[automerger skipped] Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file" into main am: eaf1c10e -s ours am: 906c60f2 -s ours am: f393fae5 -s ours am: beed53f2 -s ours am: d5a8ad96 -s ours

am skip reason: subject contains skip directive

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



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