RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag"

This reverts commit 27c28b94283b491c58d5981fc580cd89e5c251c5.

Change-Id: Ic11952e0ebc913ee453aa47e559b0fd0232816db
Bug: 169414761
2 files changed