[automerger skipped] Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 am: 56cc4a092d am: 495a05886f -s ours
am skip reason: Merged-In I3331d7e3d76db50f5b3c4db57891a20e4f935ad8 with SHA-1 67c75e4640 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186
Change-Id: I9a4eaadeb2dcbfa8175b3e7e45cf54172b05e7c2
This commit is contained in: