[automerger skipped] RESTRICT AUTOMERGE Handling removing <original-package> tag am: 552bf38f am: f583d453 -s ours am: 2bf8e191 am: 11abe39a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68c191a68078ab069421c433cc489074b0c99bdb