Merge "Add aquilescanta to SettingsLib owners"