Revert^2 "Code refactoring: Move doRename out of preparePackageLI"

This reverts commit e40dcd9ec3527ef1e5c329a6aa5f63798a6e2971.
And fixed side effect that causes OOM when executes
SdkSandboxManagerServiceUnitTests.

Test: atest SdkSandboxManagerServiceUnitTests
Test: atest CtsInstallHostTestCases
Test: atest CtsCompilationTestCases
Change-Id: I9f41721972f22f21d5b1e2c1f8bb34b03f37f6b3
4 files changed