Merge "Revert "wificond_service: drop system_service typeattribute"" am: 47ab9eaf6b
am: 000a7b4451

Change-Id: I2622546e00f914a5f43ef4dfa490f1f65a1df584