Merge "Added check to copy AVB footer" am: 4aa47338 am: 4b978262 am:...

Merge "Added check to copy AVB footer" am: 4aa47338 am: 4b978262 am: 7e5d9609 am: fbd4e76f am: 66a6b2ed

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



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