[automerger skipped] Merge "Split parcelable .aidl files to aidl-export" am: 09bbad130d am: 634c81f7e8 am: 50f740a4e9 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9935ed6b33b57bb9360b1086aaaaad85ee98e89
tree: cb4e0b04305dc7873c62adb3017eba8159e91d42
  1. core/
  2. services/