Remove old blocklist code, prepare for changes

Bug: 302188278
Test: Unit tests
Change-Id: I38f24477e6906d507bbff4403dcc44cec027d432
9 files changed