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

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



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