Revert erroneous rename from previous CL

Test: atest PersistentDataBlockServiceTest
Bug: 290312729
Change-Id: I05f7640641d93fc4dbc871f489871cc24e42234a
1 file changed