Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev am: 23ed7d76 am: 87b90a19 Change-Id: Ic2a320acaf707809bbff0ae54d5fa1521cadf299