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 am: 3c47a2db

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



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