[automerger skipped] Merge "Update the java doc to match the behavior" into udc-dev am: 390e76d7 am: 6f787b1d -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: Ie5050ed47784a99a6f7e98a9339c62884d3d45e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>