Merge "Block align start and length while punching holes" into main am: 66771434

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3050289



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