[Regression] Delete autoblocks when removing autoblock flag

Since I5403f6e1d7f8f07273cd5da8068b928fdddcdfc9 on reblock the block
will be updated and not deleted/inserted and that update did not trigger
a delete of existing autoblocks.

Bug: 62748
Change-Id: I50384a41d819689944907e653e2495391253831b
Merge "[Regression] Delete autoblocks when removing autoblock flag"