[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 am: 70b6d3e3 -s ours am: 972f13ec -s ours am: d205001d -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: I2cb6e2bbec11d6f0b21f66e74243acfd7c5bd5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>