Merge "Move parcelable aidl files into package" am: 1205a2e057 am: 8742d9b84f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2327614

Change-Id: I80d34bcec32253b99ce7a471d83916b6d6c6336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>