Merge "Add string resources to support GB_en" into nougat-cts-dev