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

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



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