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

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

Change-Id: I08f5fb4cd108c50c0aca7fb6e0f7c6577cd399c5