RESTRICT AUTOMERGE Handling removing <original-package> tag

This reverts commit I7b9d3c786d653a9b00a553e89d7390bcef45c0f2.

Fixes: 169414761
Test: Manual
Test: Add package A
Test: Verify package A exists
Test: Remove A, add package B w/ original-package A
Test: Verify package A exists, but codepath is to package B
Test: Replace package B w/o original-package A
Test: Verify package A removed and package B added
This reverts commit dd13be00dc5654e98ddcb206dc15fc4e07829526.

Change-Id: I5d66c2b2649bd4d19b5318ea6bbcd31cb6d405fc