Merge "Updates encoding/decoding of optional metadata" am: 67fbd47a94 am: 15282ca71d

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

Change-Id: I7ac2418fabd58857d0d26de95c03772a9c641d66