[automerger skipped] Merge "Handling removing <original-package> tag" am: e682158745 am: 62964d830c am: 318ffcb05e -s ours am: 66297c8826 -s ours

am skip reason: Change-Id I198ca545f4fea3ae9d2328a845cbd9167eedf8da with SHA-1 50ee8017ea is in history

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

Change-Id: Ia729b6be0b40d648d0c0c74cb35f16e6884da8d5