Bug: 22977552 Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
Separate rule type selection from naming, launch 3P UI for non-system rules. Bug: 22977552 Change-Id: Ifbd82da2192c4aaf5f239a188a016d9e1af542d6