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: e84abf31" into udc-d1-dev-plus-aosp am: e823576d am: fe399587

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



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