Revert "Revert "Revert "SCHEDULER: Autogroup patch group by current user android UID"""

This reverts commit 16313ea744122da3f5039d6e9c6d8d7f738c1fd7.