Merge "Add necessary parcelables of metadata" am: 8ed7defe20

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

Change-Id: I145c9b1dcf79b88f8e6508ef52830f22c919d4bf