Merge "app: aboot: Enable erase abv_custom_key partition"