Merge "Block align start and length while punching holes" into main am: 667714347f am: e78b8bfeae

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

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