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

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

Change-Id: I84f28eabe8498961d6012ee3522a157ea7c2446d