Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main...

Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main am: 89d22239 am: 1eb66153

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



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