am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity"

* commit '4b6756db3c3ab982daaf378bc9677c8a1e26ece0':
  Remove unnecessary harmful finish() from SettingsActivity