Merge "Merge "Use try-with-resources to avoid accidentaly leaking unclosed...

Merge "Merge "Use try-with-resources to avoid accidentaly leaking unclosed objects." am: 943c640d am: 7d07b014 am: 24bb2264" into udc-dev-plus-aosp am: 320254a2

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



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