Merge "Fix javadoc on Context.startForegroundService" into sc-v2-dev am: ca3316df61 am: 61c9ccc55c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16095147

Change-Id: Ibcb57df3958a76b9f161e49f9cc39a49b0a9bce3