Merge \"Merge \\\"ResourcesManager: Apply ContextThemeWrapper config\\\" into nyc-dev am: 9e9c78f8ce am: 4b9a4a18f9\" into nyc-mr1-dev-plus-aosp
am: 47883d1b27

Change-Id: I8a9e2ba814469809d3cd6184bb757dfd6d64fe9c