Merge "Move 2 new FileIntegrityManager APIs to @SystemApi" into main