Merge "Update the java doc to match the behavior" into udc-dev am: 390e76d7 am: 70b6d3e3

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



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