Merge "Update the java doc to match the behavior" am: 26d81efc am:...

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

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



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