Merge "Added check to copy AVB footer" am: 4aa47338f2 am: 4b9782620e am: 7e5d9609c8

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

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