Merge "Reapply "snapshotctl: Add apply-update option"" into main am: 3aef00da3d am: 23c658aa3a

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

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