Merge changes from topic "ota-block-size-compression" into main am: 942b2136 am: ae4b84db

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



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