[automerger skipped] Merge "Split parcelable .aidl files to aidl-export" am: 886a6c1074 am: b07dde1c39 am: 8f577fc416 -s ours

am skip reason: Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 ad43ca6d40 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9935ed6b33b57bb9360b1086aaaaad85ee98e89