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: fce54f82 am: 4ef17cc3 am: c14bf0d5

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



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