Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." am: d8705358 am: 33c901fa am: 87f14121 am: 7789dfbc am: 1d616b48

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



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