Merge "wificond_service: drop system_service typeattribute" am: 899287a5 am: e7739a95 am: ac514611 am: cc0eb5b3 Change-Id: I1a9033a25228dd67c452034641f4fdb2e553f3a9