[automerger skipped] Merge "Handling removing <original-package> tag" am: e682158745 am: 62964d830c am: 318ffcb05e -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: I43c13c432212fe5fc67f3c77d260d9018762ab42