Merge "Update the java doc to match the behavior" am: 26d81efc am: 1e12f7cb am: 866e0afa

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



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