Merge "Handling removing <original-package> tag" am: e682158745

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455087

Change-Id: I20e0937247244ca8f1bb788ca41f12acc0073fee