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

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

Change-Id: Ide367657425871b9b328d75e39bfb30c6daa3b16