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

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



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