Sort tenants in tenant dropdown, per #1234993

Change-Id: I6e2fd3868ac3b0b0d1704bf034e6546726fda5c3
Closes-Bug: #1234993
Merge "Sort tenants in tenant dropdown, per #1234993"