Merge "Merge "[content-capture] remove span support, fix leaks" into udc-dev...

Merge "Merge "[content-capture] remove span support, fix leaks" into udc-dev am: 52774ac4 am: 03714878 am: 1c468872" into udc-qpr-dev-plus-aosp am: 2c04810a

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



Change-Id: If8b4ecdebe13886756ef66230e91069b4a37e697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>