This reverts commit 29fef432. We shouldn't call into AM with WM lock held. Bug: 68795262 Bug: 68305547 Change-Id: I4723488df4c5fa6839fd00c05bf3eb61253185f1