Delete default sort key if set to empty string

Bug: 49724
Change-Id: Ie3caaf4811f87911444462f83d511c0cc46c0716
Merge "Delete default sort key if set to empty string"