Merge "Revert "Updates encoding/decoding of optional metadata"" into tm-dev...

Merge "Revert "Updates encoding/decoding of optional metadata"" into tm-dev am: e8207cf8 am: a7f0259e

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



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