[automerger skipped] Merge "Split parcelable .aidl files to aidl-export" am: 09bbad130d am: 2971a5e8ba am: 8f577fc416 -s ours am: b0ee36eda0 -s ours
am skip reason: Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 8d25d67d85 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia65e9620728bcc659cbcd3b761931c6365f6a5c1
This commit is contained in: