Merge "Add tmfang as a owner of settings_enums.proto"
am: ca33485de9

Change-Id: I57955680175fd0db3909edd9bc23833c3a131465