Merge "AM: Fix deadlock when calling AMS from ATMS/WM"