Merge "Minor grammar fix in CompanionDeviceManager javadoc." am: f052b7bf91 am: c713a670c9 am: 8bac874a53 am: b30fe6f42d

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

Change-Id: If257eb57c8f6619a46cd684cc46835a263b977be