Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev...

Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev am: 6327cfe8 am: 3c89ee75

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



Change-Id: Ia2940f749255197de818a15ed0c805ea6d5ce29a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>