Merge "Update the target SDK version of AOSP SettingsIntelligence."