Merge "Remove unused Android Q sandbox references"