Merge "Revert "wificond_service: drop system_service typeattribute"" am: 47ab9eaf am: 000a7b44 am: 70b7401d am: f607f509 Change-Id: I93200c7c9d779252537e19fa818459f35b8c38bd