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

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

Change-Id: Ieda8ad960a8295a59a9e4f016fceecddcd9b388d