Merge "Add 'Android Resources'  team as OWNERS of classes in android.util"