Merge "DiskStatsService: stop checking for full-disk encryption"