Merge "Move the PlatformCompatCache in AMS to its own file"