Merge "Update Settingslib owners" am: 90fc97dfcc
am: 78081be153

Change-Id: I6a67434fdeb8fadfc32c98ae6a0d3b9c4aae66f7