am 5d72b272: Merge "Add support for SE Android to the Settings app."

* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.