Merge "Revert "Do not allow adb to set shell, system, or root uid app ops"" into main