Merge "Update Settingslib owners"
am: 90fc97dfcc

Change-Id: Id8196146c744a273331c2c1a6c39fe02274d54cd