Merge "Clarify type of EXTRA_DEVICE in javadoc" into rvc-dev am: 436719f1 am: 5754630a am: 8f76744e am: 0ccb3207

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

Change-Id: I7fe44139b406cedeffbd6690d719a751841ddced