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

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

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