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

Change-Id: Id6c0c4f36d29071497d43f36bdc8a87ade9a2e43