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

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

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



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