Merge "API refactor: context.startForegroundService()" into oc-dev am: 60e0c19505
am: 2c86398857

Change-Id: Icb60a463eaf45400b5729d738b6b643aab957517