Merge "[TIAF] Fix FD leak in AdBuffer" into udc-dev am: c246ee42 am: da0e4af7 am: 334f9277 am: 749baad2

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



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