Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." am: d8705358c6 am: 33c901faa0 am: 87f1412190 am: 7789dfbcdd am: 6814157833

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

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