Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev