Merge "libsnapshot: get options from protobuf fields" into main am: 6fe95136...

Merge "libsnapshot: get options from protobuf fields" into main am: 6fe95136 am: 2b07c329 am: 15fc623d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2879846



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