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

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



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