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: fce54f82" into tm-d1-dev-plus-aosp am: 21b922c7 am: fc20eaed

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



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