Merge "Update the java doc" am: b7e998e235

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

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