Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev