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

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

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