Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." am: d8705358c6

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

Change-Id: I53cc5c9a7baec50eb58417fd1df5c8aa0c33a742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>