Add whitespace before {{DEFAULTSORT}} calls

Bug: 49635
Bug: 48557
Change-Id: Ib37ccaca5ff83950742ced8f4ec3af13e81fbfab