Merge "Add zhfan as owner of settings_enums.proto."
am: a313cab4dc

Change-Id: I3c73118c06e8ca9e0b41573dc27d86c814068ba9