Merge "Add support for SE Android to the Settings app."