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

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

Change-Id: I0b2758370575cefbf157b4707fa40d182ac82b77