Merge "Get rid of divider above ringtone selector" into pi-dev am: 24bbc4bfe1
am: 976c1d9dd3

Change-Id: If38b79abb72a10cc7f42c5b8e8359682c3a0dc1d