Some refactoring for fixing the tests and also eliminating the use of
TreeMap but use a more light weight data structure.

Bug: 145493956
Test: atest FrameworksServicesTests:IntegrityFileManagerTest
Change-Id: I2e7dd5336c4aa3ee41c05d4af0388125751bc207
13 files changed