[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 am: 37c3ce87 -s ours

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

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



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