Revert aosp/3398620 as it causes a post boot unlock regression from loading the CT code & service.

Bug: 383437444
Change-Id: Ia87751ca2f66a0e3d750a219323fac3d4e69f2f6
1 file changed