[automerger skipped] Merge "Revert "Updates encoding/decoding of optional...

[automerger skipped] Merge "Revert "Updates encoding/decoding of optional metadata"" into tm-dev am: e8207cf8 am: a7f0259e -s ours am: 6f205252 -s ours am: 7032e1dd -s ours

am skip reason: Merged-In Iaa4cf4c0e991fab03dbb9c7665afb92a052f4210 with SHA-1 db7df5dd is already in history

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



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