Merge "Remove other partition's AVB properties" into main am: 06223362 am:...

Merge "Remove other partition's AVB properties" into main am: 06223362 am: dce3a9d6 am: c517d2fa

Original change: https://android-review.googlesource.com/c/platform/build/+/2768106



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