Merge "Clarify type of EXTRA_DEVICE in javadoc" into rvc-dev am: 436719f1b7 am: 5754630afd

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

Change-Id: I6a1c06fe3ea3e28ba60c7b4aaf2aa1e46e15cf63