[automerger skipped] Merge "Update the java doc to match the behavior" into...

[automerger skipped] Merge "Update the java doc to match the behavior" into udc-dev am: 390e76d7 -s ours am: 26c89b06 -s ours

am skip reason: Merged-In I80322ff296661972a442d799812751d5411b665b with SHA-1 5bca5c2f is already in history

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



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