Merge "Handling removing <original-package> tag" into rvc-qpr-dev am: a4fbad1f am: 7e18214d

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

Change-Id: I30b73296759989e3a6354821295aa2a2749770ac