Merge "Fix minor typo in ContentCaptureManager Javadoc" am: 6305e68c6e am: 3ffbb1f042

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b0b07498a0dcdf199825a3927776d9ab79090b6