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

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

Change-Id: I9e64ba8bd7da087d4bc8f11567e830f876138a7b