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

[automerger skipped] Merge "Revert "Updates encoding/decoding of optional metadata"" into tm-dev am: e8207cf8 -s ours am: b8225515 -s ours am: 05881132 -s ours am: debc24fb -s ours

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

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



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