Update sorting for rule types and instances.

Bug: 22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
3 files changed