Merge "Fix javadoc on Context.startForegroundService" into sc-v2-dev