Merge "Remove TEST_MANAGE_ROLLBACKS permission from @SystemApi"