Merge "Changing the packagename to SYSTEM when uid 1000 is logged in Wakelocks" into main