Merge "Removed hardcoded check to copy AVB Footer" am: 51a36614 am:...

Merge "Removed hardcoded check to copy AVB Footer" am: 51a36614 am: 46199324 am: 7838f358 am: 20efe8c8

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



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