Merge "Deprecate ActivityManager#getRunningServices" into oc-dev
am: 25b7687771

Change-Id: Id37de21d7c3ed7436a1fc75a64c300a4bf622fc6