[automerger skipped] Merge "Split parcelable .aidl files to aidl-export" am:...

[automerger skipped] Merge "Split parcelable .aidl files to aidl-export" am: 09bbad13 am: 2971a5e8 am: 8f577fc4 -s ours am: b0ee36ed -s ours am: 228545b2 -s ours

am skip reason: Merged-In I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 8d25d67d is already in history

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

Change-Id: I70bbbd1472c149ad493b3955787fd78ae3a7d31f