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

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



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