Merge "Move Theme::Entry definition to top of file" into aosp-main-future