Merge "WMS AnrController: Don't hold WMS lock when calling into AMS"