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

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



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