Merge "Revert "Updates encoding/decoding of optional metadata"" am: 1293b47435 am: a781db9ceb am: 7fc1b1ec5f am: c5503b5546 am: d7d4540329

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

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