Merge "Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into...

Merge "Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev am: 6327cfe8 am: 6366b11d am: 3f8d4511" into tm-qpr-dev-plus-aosp am: 2a1ad65e

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



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