Merge "Minor grammar fix in CompanionDeviceManager javadoc." am: f052b7bf91

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

Change-Id: I08c8cc48d74b0fbd472784cf16519ed1bd8e14fb