Merge "Revert "Updates encoding/decoding of optional metadata"" am: 1293b474...

Merge "Revert "Updates encoding/decoding of optional metadata"" am: 1293b474 am: a781db9c am: 7fc1b1ec am: c5503b55

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



Change-Id: I14b00791c0cb02af8c934ab78ce5883cb5635fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>