Merge "Deprecate ActivityManager#getRunningServices" into oc-dev