Merge "Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8 am: 4b9a4a18" into nyc-mr1-dev-plus-aosp