Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
am: 23ed7d7699

Change-Id: I5a1315765c6b0dca3c7ffca914a56a34bffd0f44