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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b8d6400d7d44b192be5ca2420d2a2e26c3be484