[automerger skipped] RESTRICT AUTOMERGE Handling removing <original-package> tag am: 552bf38f66 am: f583d453f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49f8fc717e6ff8490fb4c502d0443686c86c8349