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

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



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