[automerger skipped] Merge "Add necessary parcelables of metadata" am: 8ed7defe am: 5c6ca53a am: 56cc4a09 am: 495a0588 -s ours

am skip reason: Merged-In I3331d7e3d76db50f5b3c4db57891a20e4f935ad8 with SHA-1 67c75e46 is already in history

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

Change-Id: I9a4eaadeb2dcbfa8175b3e7e45cf54172b05e7c2