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

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

Change-Id: I019d20c5ef5fc2b9a11150529cbde5395b900ad7