Revert "Handling removing <original-package> tag"

This reverts commit 27c28b94283b491c58d5981fc580cd89e5c251c5.

Reason for revert: Adding verification method.
Bug: 169414761

Change-Id: I7b9d3c786d653a9b00a553e89d7390bcef45c0f2
2 files changed