Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to:
1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and
2) Not use the title of the URL extracted from the bookmarks database to identify the site if that bookmark is not the root
   of the origin. For example, if the user bookmarked www.google.com/foo, we do not use the title of that bookmark to
   identify www.google.com in the WebsiteSettingsActivity. If they had www.google.com bookmarked, then we would use that
   title in the WebsiteSettingsActivity.

Bug: b/2252579

Change-Id: Ic4187987ae7ce40ba3678e00d0b9b848c122f380
3 files changed