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

Change-Id: I3d94d0cc0f7c6ea6c38f4dffed92af9f73d9ebc1