Merge "Expose ota_metadata_proto for consumption" am: 51c8f9f3 am:...

Merge "Expose ota_metadata_proto for consumption" am: 51c8f9f3 am: 9dbff33b am: 580a36f8 am: ee491d95

Original change: https://android-review.googlesource.com/c/platform/build/+/1708627

Bug: 186581246
Bug: 188575410

Change-Id: I996092bd29f8f6231c8055b44d59ae87d5809127
(cherry picked from commit 77802890)